Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 27 Oct 2011 21:23:52 +0000 (14:23 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 27 Oct 2011 21:23:52 +0000 (14:23 -0700)
commitcb5e411532f6d58557dcd5f9208b1c16a0d1885b
tree9b8db0524d8fd245d3dfd726547335ff3b247bff
parentf994815f4ac8e141b4432f7150353971d4b361ab
parent228ce4905dc35710556e8b504f12782035e2bfa5
Merge from trunk.